(symbol-file): Accept a non-atomic `function' arg.

(with-local-quit): Add debug and indentation info.

diff --git a/lisp/subr.el b/lisp/subr.el
index 10e48e7a4058ae8c45edbc12609acbdc18f44ee2..093812d13c51d4edb5aa5e2312273c326cca036b 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -925,7 +925,7 @@ It can also be nil, if the definition is not associated with any file."
     (let ((files load-history)
          file)
       (while files
-       (if (memq function (cdr (car files)))
+       (if (member function (cdr (car files)))
            (setq file (car (car files)) files nil))
        (setq files (cdr files)))
       file)))
@@ -1603,6 +1603,7 @@ See also `with-temp-file' and `with-output-to-string'."
 
 (defmacro with-local-quit (&rest body)
   "Execute BODY with `inhibit-quit' temporarily bound to nil."
+  (declare (debug t) (indent 0))
   `(condition-case nil
        (let ((inhibit-quit nil))
         ,@body)